Change all uses of `use foo = bar` to `use bar as foo`

diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs
index db0d24b2d1d176df04e97a4629fac7f2024446e8..9bf5c126060b41235cc31cf441d9aecb49195c33 100644 (file)
--- a/src/cargo/ops/cargo_generate_lockfile.rs
+++ b/src/cargo/ops/cargo_generate_lockfile.rs
@@ -4,7 +4,7 @@ use std::io::File;
 
 use serialize::{Encodable, Decodable};
 use toml::Encoder;
-use toml = toml;
+use toml as toml;
 
 use core::registry::PackageRegistry;
 use core::{MultiShell, Source, Resolve, resolver, Package, SourceId};
@@ -12,7 +12,7 @@ use core::PackageId;
 use sources::{PathSource};
 use util::config::{Config};
 use util::{CargoResult, human};
-use cargo_toml = util::toml;
+use util::toml as cargo_toml;
 
 pub fn generate_lockfile(manifest_path: &Path,
                          shell: &mut MultiShell)

diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
index 9878fe29e11709198e4c36da86418ee8797b389d..6e03115ac6bc01496f0c2cd48614742aed28d680 100644 (file)
--- a/src/cargo/util/config.rs
+++ b/src/cargo/util/config.rs
@@ -5,7 +5,7 @@ use toml;
 use core::MultiShell;
 use util::{CargoResult, ChainError, Require, internal, human};
 
-use cargo_toml = util::toml;
+use util::toml as cargo_toml;
 
 pub struct Config<'a> {
     home_path: Path,

diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs
index 352afb3561f0f8350645aea5b3d1745e168eaf20..e93b6b96b90dd47883cf75df6a03f8faa2fbf724 100644 (file)
--- a/src/cargo/util/errors.rs
+++ b/src/cargo/util/errors.rs
@@ -5,7 +5,7 @@ use std::fmt::{Show, Formatter, FormatError};
 use std::str;
 
 use docopt;
-use TomlError = toml::Error;
+use toml::Error as TomlError;
 use url;
 use git2;